Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

numbat: unbreak on darwin #366999

Merged
merged 1 commit into from
Dec 30, 2024
Merged

numbat: unbreak on darwin #366999

merged 1 commit into from
Dec 30, 2024
+0 −2

Conversation

harry-xm
Copy link
Contributor

Tests pass on macOS (arm64).

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@harry-xm
numbat: unbreak on darwin
c3a2bcb 
Tests pass on macOS (arm64).
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Dec 21, 2024
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 21, 2024
@NickCao
Copy link
Member

NickCao commented Dec 21, 2024

Tests pass on macOS (arm64).

What about x86_64? I think you can can do that on arm64 macs thanks to rosetta?

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 21, 2024
@harry-xm
Copy link
Contributor Author

Tests pass on macOS (arm64).

What about x86_64? I think you can can do that on arm64 macs thanks to rosetta?

I don't have a x86_64 macOS environment at hand, so I could not test that.

Rosetta is not involved. I have a binary natively compiled for arm64 from nix-build --attr pkgs.numbat and ran the .passthru.tests test.

/nix/store/52kw78hgyws3ndmik1hd9n7by6na9qzw-numbat-1.14.0/bin/numbat: Mach-O 64-bit executable arm64

@ofalvai
Copy link
Contributor

ofalvai commented Dec 29, 2024

Both Darwin platforms build for me, LGTM (nixpkgs-review didn't pick up the changes, I ran the builds manually)

@harry-xm Nix on aarch64-darwin can automatically build x86_64-darwin packages via Rosetta emulation. You need to set the systems property in your Nix config, then do a nix build --option system x86_64-darwin.

@harry-xm
Copy link
Contributor Author

@harry-xm Nix on aarch64-darwin can automatically build x86_64-darwin packages via Rosetta emulation. You need to set the systems property in your Nix config, then do a nix build --option system x86_64-darwin.

Wow! That sounds like dark magic to me. Tested with Rosetta and the x86_64 binary seems fine.

natsukium
natsukium approved these changes Dec 30, 2024
View reviewed changes
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contribution!

@natsukium natsukium merged commit 495816d into NixOS:master Dec 30, 2024
41 of 42 checks passed
@harry-xm harry-xm deleted the patch-1 branch December 30, 2024 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@natsukium natsukium natsukium approved these changes

@ofalvai ofalvai ofalvai approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@harry-xm @NickCao @ofalvai @natsukium @NixOSInfra